Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.
authorBastien Guerry <bzg@gnu.org>
Tue, 8 Jan 2013 15:31:30 +0000 (16:31 +0100)
committerBastien Guerry <bzg@gnu.org>
Tue, 8 Jan 2013 15:31:30 +0000 (16:31 +0100)
commit71795774bc153ec9fc51423f0c970f4527e9b98a
treee285daa7fe6320553cb23b357bee91877f365477
parentd3098a0517cdc57bb90594ca7c89424542bf01bd
Merge Org (commit c8c217).  Fix mistake about updating the wrong ChangeLog.
doc/misc/ChangeLog
doc/misc/org.texi
lisp/ChangeLog
lisp/org/ChangeLog
lisp/org/org-src.el
lisp/org/org-version.el